Skip to content

Merge glb and lub modules #131191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 4, 2024
Merged

Merge glb and lub modules #131191

merged 2 commits into from
Oct 4, 2024

Conversation

nnethercote
Copy link
Contributor

Tons of code is duplicated across them, and it's easy to factor that out.

r? @lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 3, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 3, 2024

changes to the core type system

cc @compiler-errors, @lcnr

@rust-log-analyzer

This comment has been minimized.

Sign in to view
lcnr
lcnr reviewed Oct 3, 2024
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change itself is positive, even if my medium-term goal is to remove these relations entirely.

@nnethercote
Copy link
Contributor Author

I have addressed the comments and fixed the rustdoc error. Thanks!

lcnr
lcnr reviewed Oct 3, 2024
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me after nits

@nnethercote
Merge rustc_infer::infer::relate::{glb,lub}.
0aab101 
Most of the code in these two modules is duplicated in the other module.
This commit eliminates the duplication by replacing them with a new
module `lattice_op`. The new `LatticeOpKind` enum is used to distinguish
between glb and lub in the few places where the behaviour differs.
@nnethercote
Remove LatticeDir trait.
ee227de 
It's no longer necessary now that the `glb` and `lub` modules have been
merged.
@nnethercote
Copy link
Contributor Author

I addressed the latest comments.

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Oct 3, 2024

📌 Commit ee227de has been approved by lcnr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2024
@bors
Copy link
Collaborator

bors commented Oct 4, 2024

⌛ Testing commit ee227de with merge 7067e4a...

@bors
Copy link
Collaborator

bors commented Oct 4, 2024

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 7067e4a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 4, 2024
@bors bors merged commit 7067e4a into rust-lang:master Oct 4, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 4, 2024
@nnethercote nnethercote deleted the lattice_op branch October 4, 2024 04:48
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7067e4a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 0.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.9% [3.6%, 4.3%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.4% [-2.6%, -2.2%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary 2.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.5% [1.9%, 3.1%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 774.169s -> 772.19s (-0.26%)
Artifact size: 342.02 MiB -> 342.02 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr left review comments

Assignees

@lcnr lcnr

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @rustbot @rust-log-analyzer @bors @rust-timer @lcnr